b572ba2792ecf3acddab100c5102ef53eee6f0a1,opennms-tools/mib2events/src/main/java/org/opennms/netmgt/mib2events/Mib2Events.java,Mib2Events,printEvents,#PrintStream#,146

Before Change



                    event.marshal(writer);

                    String noNameSpace = writer.toString().replaceAll(" xmlns=\"[^\"]*\"", "");

                    ByteArrayOutputStream formattedXml = new ByteArrayOutputStream();
                    prettyPrintXML(new ByteArrayInputStream(noNameSpace.getBytes()), formattedXml);
                    String noXmlProcessingInstruction = formattedXml.toString().replaceAll("(?m)<\\?xml version=\"1.0\" encoding=\"UTF-8\"\\?>\n", "");
                    String singleQuotesLogMsgDest = noXmlProcessingInstruction.replaceAll("dest=\"logndisplay\"", "dest='logndisplay'");
                    out.print(singleQuotesLogMsgDest);
                }
            } catch (MarshalException e) {

After Change


                continue;
            }

            Events events = convertMibToEvents(mib, getEffectiveUeiBase());

            if (events.getEventCount() < 1) {
                System.err.println("No trap definitions found in this MIB (" + mib.getName() + "), exiting");
                System.exit(0);
            }

            if (!m_compat) {
                StringWriter writer = new StringWriter();

                events.marshal(writer);

                stripXmlNameSpace(writer.toString(), out);
            } else {
                for (Event event : events.getEventCollection()) {
                    StringWriter writer = new StringWriter();

                    event.marshal(writer);

                    ByteArrayOutputStream formattedXml = new ByteArrayOutputStream();

                    stripXmlNameSpace(writer.toString(), formattedXml);

                    String noXmlProcessingInstruction = formattedXml.toString().replaceAll("(?m)<\\?xml version=\"1.0\" encoding=\"UTF-8\"\\?>\n", "");
                    out.print(noXmlProcessingInstruction.replaceAll("dest=\"logndisplay\"", "dest='logndisplay'"));
                }
            }
        }